obs-outputs: Add eRTMP/eFLV multitrack support #10500
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
from
34c96bf to
0492d45
Compare
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
2 times, most recently
from
4391905 to
6746e20
Compare
|
With #10494 merged, this can be rebased and undrafted. |
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
from
6746e20 to
667ab1c
Compare
PatTheMav
reviewed
Apr 16, 2024
Lain-B
approved these changes
Apr 17, 2024
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
from
d7cd61b to
9423d35
Compare
|
@RytoEX: nits should be addressed and squashed (and rebased) |
derrod
suggested changes
Apr 19, 2024
There was a problem hiding this comment.
A couple smaller things, it would be good if you could also adjust init_send() to correctly accumulate bitrate from all video encoders rather than just the primary one, that should fix the issues peopole have seen with the network enhancement options, but that's not a blocker for now.
RytoEX
requested changes
Apr 24, 2024
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
3 times, most recently
from
62550bf to
26a18c4
Compare
6 tasks
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
2 times, most recently
from
4154cfb to
ba55e1d
Compare
|
Off-thread discussion indicates that this looks good. Squash the commits appropriately and we'll give it a (hopefully) final pass. |
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
from
ba55e1d to
552f30a
Compare
@RytoEX: squashed and rebased |
This will be initialized to 0 in various cases, so let's make that a valid enum value (even if it's not valid in rtmp?)
palana
force-pushed
the
ruwen/upstream-rtmp-changes
branch
from
552f30a to
b0799b8
Compare
RytoEX
approved these changes
May 3, 2024
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Add eRTMP multitrack video support for the rtmp output and "full" eFLV support for the FLV output (both additional video codecs and multitrack video)
Motivation and Context
This allows transmitting multiple video streams within the same RTMP connection; it's used for Twitch Enhanced Broadcasting to allow multiple renditions to be sent through a single RTMP connection, helping ensure that renditions remain aligned
How Has This Been Tested?
It's being used in the Twitch Enhanced Broadcasting Beta
Types of changes
Checklist: